Deleted some comments

Signed-off-by: Malm
Made it completely dependent of Rectangle

Signed-off-by: Malm
Fixed a collision related bug in Rectangle and made it more accurate

Signed-off-by: Malm