Bootstrap example
Code cleanup & bugfixes