Finished - fixes