Fixed and reported bugs

Top