Removed draw square and fixed some methods
Updated and implemented methods