Development finished, fixing bugs