Commit

Numberous bug fixes N stuffs