Features

Bug fixes and improvements