No major changes since last commit but to list a few:
	- moved more code to block helper for further code simplification
	- cleaned a few lines where applicable
	- editted waila class note to further show its purpose :)