made some minor improvements


All the rest will be done later time to sleep