Some cleanup and uninitialized variable fix
Small fix
Merge branch 'master' of https://github.com/tonk/PnEE into tonk-master

Conflicts:
	lib/library
Merge branch 'tonk-master'