Bugfix and stuff