fixed f@cking bugs!