Fixed some issues after feedback

Should be final release for real this time!