Fixed all known bugs