Tons of fixes and feature additions