fixed the most flagant bugs
cosmetics