fixed several issues with assembly