Fixed collision shapes
Implemented various functions
Various other changes