[1625] Bugs corrected, ready to rewiev