Improve & correct errors