Lots of new changes

Beta #2 very soon, just want to save some changes to GitHub for safe
keeping