Fixed all bugs (really?)