More work on rectangle; physics still bugged;