Committing fixes to code to fix stupid issues of appending clusters instead of
extending a list with them and other similar things