better rect test, also correctly use angle property