Beta 2

Fixed a lot of bugs and improved the user experience