bugfixes and cleanup
1 file changed