final fixes and changes for alpha1 release

fixes #36 and lots of other some stuff