Fixes and updates for first working version