First bugs fixed