Finished some Features, Small Bug Fixes