Fixed 3 small buggs