Fixed some rough edges, removed crap