finished it all up but 2 nagging issues